Removed theme caching again - need to ensure theming works properly before caching.