Fixed caching and reverted to produciton logic