Reorganization, added NoCacheAttribute