Fixing the message error
Using the cache only if its setted
Merge branch 'setting-cache'