Initial checkin for integration with new caching mechanism
Initial checkin for integration with new caching mechanism