Added APC caching support