Renamed variable

Added flexible caching mechanism