Added johnny-cache, manual invalidation for raw queries