Added action caching and removed references to cache pages