[+] Cache code refactored (issue #15)