Fixed db caching