Re-enabled caching. Fixed issues when PK field !== "ID"