Added caching via database
Added caching via database