diff of 35f80b1bc77946c949ceee848957637d5521a58e

35f80b1bc77946c949ceee848957637d5521a58e
diff --git a/src/model/settings.lisp b/src/model/settings.lisp
index 597c2b3..29317ed 100644
--- a/src/model/settings.lisp
+++ b/src/model/settings.lisp
@@ -84,14 +84,16 @@
 		  `(progn
 		     (defun ,(kw-to-sym setting-name) (&optional value)
 		       ,(format nil "If called without parameters, returns current value of ~a. If with parameters, update's setting's value both in-app and in db" setting-name)
-		       (assert *cache* nil ,(format nil "Settings (trying to get ~a) aren't loaded. Please use murja.model.settings:with-cache" setting-name-str))
-		       (if value
-			   (progn
-			     (setf (gethash ,setting-name-str *cache*) value)
-			     (update-setting ,setting-name-str value)
-			     value)
-			   
-			   (gethash ,setting-name-str *cache*)))
+		       (unless *cache*
+			 (format t ,(format nil "Settings (trying to get ~a) aren't loaded. Please use murja.model.settings:with-cache~%" setting-name-str)))
+		       (with-cache
+			 (if value
+			     (progn
+			       (setf (gethash ,setting-name-str *cache*) value)
+			       (update-setting ,setting-name-str value)
+			       value)
+			     
+			     (gethash ,setting-name-str *cache*))))
 		     (setf (gethash ,(funcall setting-name-kwcleaner setting-name)
 				    *setting->getter*)
 			   (function ,(kw-to-sym setting-name)))))))