Finally added cross-cutting caching injection to ! Performance should significantly improve now