Move cache to separate module