Improved on sqlite caching system