Refactored the cache for Postgres and H2.