Fixing StaticCache